bitkeeper revision 1.1159.1.430 (419b8a184G5YMMZLkh4hHAhTI-Bxvg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 17 Nov 2004 17:27:52 +0000 (17:27 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 17 Nov 2004 17:27:52 +0000 (17:27 +0000)
Merge

1  2 
.rootkeys
BitKeeper/etc/logging_ok

diff --cc .rootkeys
Simple merge
index 9c08485b369b92607a44a80d24eefe693fd2e8cb,9c08485b369b92607a44a80d24eefe693fd2e8cb..cbc3dd3c3e1f104bdf45530dffaa5bc2e27eb79b
@@@ -10,6 -10,6 +10,7 @@@ br260@br260.wolfson.cam.ac.u
  br260@labyrinth.cl.cam.ac.uk
  br260@laudney.cl.cam.ac.uk
  bren@anvil.research
++cl349@arcadians.cl.cam.ac.uk
  cl349@freefall.cl.cam.ac.uk
  cl349@labyrinth.cl.cam.ac.uk
  cwc22@centipede.cl.cam.ac.uk